bitkeeper revision 1.1159.187.78 (41c9d4768ZT219TwwhKCb8dfwHcdkA)

xencons fix.

diff --git a/tools/misc/xencons b/tools/misc/xencons
index 5882a60c63c8ad8bff3049424b6ce72df7d8834e..8bd3178eab4e925afc6242688595a9567fb593c2 100755 (executable)
--- a/tools/misc/xencons
+++ b/tools/misc/xencons
@@ -30,11 +30,12 @@ def __recv_from_sock(sock):
         except socket.error, error:
             if error[0] != errno.EINTR:
                 raise
-        try:
-            os.write(1, data)
-        except os.error, error:
-            if error[0] != errno.EINTR:
-                raise
+        else:
+            try:
+                os.write(1, data)
+            except os.error, error:
+                if error[0] != errno.EINTR:
+                    raise
     os.wait()
 
 def __send_to_sock(sock):

diff --git a/tools/python/xen/util/console_client.py b/tools/python/xen/util/console_client.py
index 5882a60c63c8ad8bff3049424b6ce72df7d8834e..8bd3178eab4e925afc6242688595a9567fb593c2 100644 (file)
--- a/tools/python/xen/util/console_client.py
+++ b/tools/python/xen/util/console_client.py
@@ -30,11 +30,12 @@ def __recv_from_sock(sock):
         except socket.error, error:
             if error[0] != errno.EINTR:
                 raise
-        try:
-            os.write(1, data)
-        except os.error, error:
-            if error[0] != errno.EINTR:
-                raise
+        else:
+            try:
+                os.write(1, data)
+            except os.error, error:
+                if error[0] != errno.EINTR:
+                    raise
     os.wait()
 
 def __send_to_sock(sock):